Auto merge of #1242 - alexcrichton:issue-1236, r=wycats
authorbors <bors@rust-lang.org>
Thu, 29 Jan 2015 19:50:58 +0000 (19:50 +0000)
committerbors <bors@rust-lang.org>
Thu, 29 Jan 2015 19:50:58 +0000 (19:50 +0000)
Set out to solve #1236, but ended up solving #834 as well!


Trivial merge